Spawn parentless sequential xtriggered task on set outputs #6448
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Will add a test (or add to existing). |
dwsutherland
changed the title
MetRonnie
reviewed
Oct 24, 2024
cylc/flow/task_pool.py
Outdated
Comment on lines
2136
to
2128
| # Task may be set running before xtrigger is satisfied, | ||
| # if so check/spawn if xtrigger sequential. | ||
| elif ( | ||
| itask.is_xtrigger_sequential | ||
| and ( | ||
| itask.identity not in | ||
| self.xtrigger_mgr.sequential_has_spawned_next | ||
| ) | ||
| ): | ||
| self.xtrigger_mgr.sequential_has_spawned_next.add( | ||
| itask.identity | ||
| ) | ||
| self.spawn_to_rh_limit( | ||
| itask.tdef, | ||
| itask.tdef.next_point(itask.point), | ||
| itask.flow_nums | ||
| ) | ||
| else: | ||
| # Task may be set running before xtrigger is satisfied, | ||
| # if so check/spawn if xtrigger sequential. | ||
| self.check_spawn_psx_task(itask) | ||
| # De-queue it to run now. | ||
| self.task_queue_mgr.force_release_task(itask) |
There was a problem hiding this comment.
This has changed the logic - was it meant to? Or should it be
# Task may be set running before xtrigger is satisfied,
# if so check/spawn if xtrigger sequential.
elif not self.check_spawn_psx_task(itask):
# De-queue it to run now.
self.task_queue_mgr.force_release_task(itask)(having changed check_spawn_psx_task to return a boolean)?
There was a problem hiding this comment.
Yeah, but I figured it was ok to de-queue and spawn (if psx) if not runahead released..
There was a problem hiding this comment.
Have changed it like you said... better to keep them separate I suppose, since they are different category of action..
There was a problem hiding this comment.
Actually, strike that .. This is a force trigger .. PSX tasks should be spawned outside of this runahead/de-queue here.. So have put this outside and after the if/else block.
dwsutherland
force-pushed
the
spawn-on-set-parentless-seq-xtrig-tasks
branch
from
34ce7b3
to
f50b365
Compare
dwsutherland
force-pushed
the
spawn-on-set-parentless-seq-xtrig-tasks
branch
from
f50b365
to
edd8c86
Compare
dwsutherland
force-pushed
the
spawn-on-set-parentless-seq-xtrig-tasks
branch
from
edd8c86
to
d08137b
Compare
hjoliver
approved these changes
Oct 25, 2024
MetRonnie
approved these changes
Oct 29, 2024
wxtim
added a commit
to wxtim/cylc
that referenced
this pull request
Nov 12, 2024
* upstream/master: Update cylc/flow/rundb.py GH Actions shortlog: check out head ref Add Paul Armstrong to CONTRIBUTING.md Report the error if write attempts fail to the DB Functional tests: allow `grep_fail` to accept options (cylc#6463) Bump dev version Prepare release 8.3.6 Bump pypa/gh-action-pypi-publish from 1.11.0 to 1.12.2 Simplify task state deltas Refactor task killing Bump pypa/gh-action-pypi-publish from 1.10.3 to 1.11.0 (cylc#6455) [skip ci] Spawn parentless sequential xtriggered task on set outputs (cylc#6448) Delete changes.d/6404.fix.md Pass pre-install plugins the value of workflow rundir as options.against source, allowing re-install and validate against source to access previous CLI opts as stored in rose-suite-cylc-install.conf
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
closes #6447
Check List
CONTRIBUTING.mdand added my name as a Code Contributor.setup.cfg(andconda-environment.ymlif present).?.?.xbranch.